Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 28 Nov 2011 08:14:38 +0000 (00:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 28 Nov 2011 08:14:38 +0000 (00:14 -0800)

Trivial merge